am 55b7d124: merge from open-source master

Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken

* commit '55b7d1243f15395a102971e8fdc57444638729ac':
  SetLocaleByCarrier, only if its not an unknown carrier.