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

Change-Id: Ia79761d8fb5b1bbdad7a0230dd5d1daef998ead2