[automerger skipped] Merge changes from topic "security_fix_settings" into...
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b13 -s ours
am: 80fea5de -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d932857 is in history
Change-Id: Ic06c39295c0b1e82701cf1747606afff1e27fd68