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

* commit 'e4d341503bc02f5e5712ec1eb3c8da4653b84f99':

Change-Id: Ibb3968bc70defd4676765e2936291e62da6504c2