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

* commit 'e3ec8442781ac765c760c6096393863a62b6a26d':
  Revamped CustomLocale for the SDK.