Merge "Modify account settings for better locale resolution" into lmp-mr1-dev