Merge changes from topic '62033391' into oc-dr1-dev
am: 97d1c4f234

Change-Id: I33111bae2e009087d979b5f83b0d76a6ba9328c1