Merge "Removed deprecated setAuthentication() method that didn't take ids." into oc-dev am: 136a48e36a
am: 68eecb37d8

Change-Id: If40b81d68913a162f77581b09932647846c992c1