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

Change-Id: I641ba8de65451ddfab0bd38dcdb09d98f1039fb1