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

* commit '45c02ee9d5046bf9b03681c2c888e015ce8ddfa9':

Change-Id: I29f35223c04d9d1afe4c8b5511f1a04cf53821ee