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

Change-Id: I83915ffc8745cf102573e9dc7a762236ed57d696