am 33d8964c: am e3ec8442: am 2fa9bd29: Merge "Revamped CustomLocale for the SDK."

* commit '33d8964ce12e438e70456be368bbbf2702efb05b':
  Revamped CustomLocale for the SDK.