Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb
am: 78a7ee2f10

Change-Id: I82960fb637152698cb676fae82862408b1a2db75