Merge "Track TimeZoneDistroInstaller method changes" am: ba6b96d978
am: 7ab9d93fa4

Change-Id: I0388475b92a6b4f981d5027992af461f48181ab2