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

Change-Id: Iac65c4fb8ded870857207c316946535f4ec87a5f