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: If1f18d7c56bbe56353319b2f394f90121f050fc7