am 7fe85fa7: am 63790291: am 2081769f: am 618d96da: am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev

* commit '7fe85fa70b22c70a9a9eb90664f0aa4442cacdbe':
  Replace Locale.getDefault with custom impl.