Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev
am: 8c5514b186

Change-Id: I20cb7234b5b7a48b57af23b71311989978503de9