[automerger skipped] Merge changes from topic "am-96a5eb3e-2317-4e97-b0f7-e4891ab64c97" into oc-dev am: 931f0f70 -s ours am: e8397ec0 -s ours Change-Id: I5502ea22beed77033d518bfdb27390cb516b7340