Make the new variable default to the old variable for backwards compat. Change-Id: I75d5e576276d68bfa23006d7ad4c2a86cb7f5050