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

Change-Id: I0b71a7b1e52c57658b7cef1521b16c15e1f2481d