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

* commit '2fa9bd29f6e6c1694e38f547a5d11e01d5189697':
  Revamped CustomLocale for the SDK.