Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev am: c1dc805861 am: 812ec62a14 am: c3ff91a225
am: 12835665f3

Change-Id: Ie2ae1dfe4d816b85fa47d77188cdc654eaa9b3dd