Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev am: 36c202ed80 am: cf31e066a9 am: f64dcd5bb5
am: 6e6d44012f

Change-Id: Ic105693209501df8aa09d05f993f506aeb77eca5