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

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

Change-Id: I5e0b6959d420ce88bebdada253f4b805e0016a8a