Merge commit '721620394144b57deed2d8ba6ec44f08a8aa6690' of sso://googleplex-android/platform/packages/apps/TimeZoneUpdater into HEAD Change-Id: I4fd57af6ef2c01b5d4eff08b207675183efe2c72