Merge "Revert the time zone display name logic" into oc-dev
am: d9b1697b2d

Change-Id: I9f28c603a44290c49121bd06694a84dab73747be