Merge "[automerger skipped] Merge changes from topic "security_fix_settings"...

Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b13 -s ours am: 80fea5de -s ours am: 5a326027 -s ours am: ba012240 -s ours am: 290b4e50 -s ours am: 723fb8dc -s ours
am: f376fc4e -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d932857 is in history

Change-Id: I2c9d46d7f1a73e825283797ecd8aeccfee8834f1