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

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

Change-Id: Ia87353d83a3952c2cc90f979431a071d8b7f076a