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

Change-Id: I53a031d168c65894bd94d1adfcdfaf97b3617921