Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev
am: 33be0d800a

Change-Id: I589409d6a34ed7091fa182fad4a9d86f65970b38