Merge "Fix double auth issue" into qt-qpr1-dev
am: 07d866a10e

Change-Id: I5682f515d160a1acf1087c7dc9dfd55ed5e44875