am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev

* commit '8e095594a640a82b850ff3990bb690920eba921c':
  Stop showing long names for local timezones when it is ambiguous