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

Change-Id: Ifbfbc37bca95ee2314769ad038e65d3c874e575f