Merge "Reformat timezone display name to de-emphasize GMT and sun." into jb-mr2-dev