Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev am: eb92e99a06 am: 9a953b1022 am: 099172c463
am: 3fdf84ce77

Change-Id: Ia4a1c370bac3d62a5e2f050a2e8091005c5b57e4