Android m preview 1
Merge "Revert "Stop showing long names for local timezones when it is ambiguous""