Merge "Track TimeZoneDistroInstaller method changes"
am: ba6b96d978

Change-Id: I9352872ceb2d11739a4372589f69bb473f3457d3