Merge "Remove reuse of TimeZoneDistro" am: e2cca16dce am: f6fad7a234 am: 0bebf5b272
am: a22dde2e13

Change-Id: I8dc215560b1cdb75fed304ec6fc420278275584c