[automerger skipped] Merge changes from topic "back111085900" into oc-dev am: f0095ec4d6 am: 5e8e47d4f8 am: 3375c14aef  -s ours am: 5c16aa778a  -s ours
am: 6ff3b366f9  -s ours

Change-Id: Ia51b76e3c72bb617260dbfc38a172ed434c11317