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

Change-Id: Ifdbce0f693c4c2fd011fdbb08b974c14da893d3b