Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev am: 33be0d800a am: e90b1d120c
am: 06908ed009

Change-Id: Ia9f82bf142fb7e168da1c14807e8d6b85bd13f32