Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev
am: 836d1db239

Change-Id: I519b06f3c9f41b874d0c1f37f0494bbbd080e50e