am 3c00e18b: Merge "Modify account settings for better locale resolution" into lmp-mr1-dev

* commit '3c00e18ba7425a1837a1e458f16e5192254a196b':
  Modify account settings for better locale resolution