Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev am: c70d882667
am: c262f7a96a

Change-Id: If96c64288656012f02de0edfd0d8cf7ff26abae4