Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am: eb82e3de87
am: c1867dedfa

Change-Id: If2f639d07a44861b96b4497cc3dc02364dc85c51