Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev am: d349bd741d am: cf751f2189 am: dc3d2a5db0 am: 1199aac873
am: 634b9be591

Change-Id: Ia80fd8e9907c5e56fdae384e9f1ff00eb47598c9