Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev
am: 3fa917c8bc

Change-Id: I9b83367bb794f295c81ccfaf7c9ac1f2113c72e4