Merge "Work on issue #27995384: Time in the top bar different..." into nyc-dev...
Merge "Work on issue #27995384: Time in the top bar different..." into nyc-dev am: cdcc53d0 am: 6d8d2a03
am: 238aaf73
* commit '238aaf73':
Work on issue #27995384: Time in the top bar different...
Change-Id: I5e0b6959d420ce88bebdada253f4b805e0016a8a