[automerger skipped] DO NOT MERGE: Fix various settings chassification bugs am: 2d23f495ff -s ours
am skip reason: subject contains skip directive

Change-Id: Iab6224bde3b4627aa752e288a3a5f6a4bb81f49b