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

Change-Id: I5462a5f019cef0d1b4cc11657633ef4f78034f6c