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

Change-Id: I5bff44b8b6e7384eada300a2c904ab11c12e028f