[automerger skipped] Merge changes from topic "am-c709fe3e-1c07-4ecd-9998-2477e3445dd4" into oc-dev
am: d5e6e1e83e  -s ours

Change-Id: Ie4fb9ca93c435f53cfe6db23b4902b094506b618