Merge "Work on issue #27995384: Time in the top bar different..." into nyc-dev
am: cdcc53d007

* commit 'cdcc53d007d613ccfcf3a36ce22fa6823c5fe954':
  Work on issue #27995384: Time in the top bar different...

Change-Id: Ia10ef2de16cf3ce18fa8a8ff3ddbbe05d9fe39d1