[automerger skipped] Merge changes from topic "am-76da18a1-f110-471a-a87f-39868ce95109" into oc-dev
am: 10819cc3 -s ours
am skip reason: change_id If7421c452b5893ab2567323d265503a1ce304482 with SHA1 231a1218 is in history
Change-Id: I333ce1ee5ff2f0e261713e969c4e0722d12a3692