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: 45c02ee9
am: e4d34150
* commit 'e4d34150':
Change-Id: Ibb3968bc70defd4676765e2936291e62da6504c2