Merge "[Settings] Correct spelling in source code"
am: 22c5c7d4a4

Change-Id: Ia9322a82c58385c4aed2f4b3ffa0d85aed7b123f