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

Change-Id: Ia81cd576c5acdaf0008c21fbea9fb5a16c3c89bf