DO NOT MERGE: Fix various settings chassification bugs am: 6d4565e72d am: cfc5a984d1 am: 4926b91464

Change-Id: I59762fb88b537e418d8d188370e13fd054277aaa
tree: a958acc566af148b4a002248db8f93d3614072fc
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg