[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 09e25567 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d932857 is in history
Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407