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

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