[automerger skipped] Merge changes from topic "am-23973cb8-6ed2-4797-9749-019d6251e3c6" into oc-dev am: bb411369 -s ours am: 0be491ae -s ours Change-Id: Ie9b777d06d1713c8528da8cd08fb05d88afc8c34