Merge changes from topic "am-4bdcb83abb6d48bdb4e0cf0cd49e3f13" into oc-dr1-dev
am: e96cf4aac5

Change-Id: I3cefc746eaa3ac3e7954d36726ecbaa5ad87699a