[automerger skipped] Merge "Fix double auth issue" into qt-qpr1-dev am: 07d866a10e
am: a035bd1356 -s ours
am skip reason: change_id Icd457dc79cb6f86a7cbb22a78ee80ebfbb4380a7 with SHA1 737b851893 is in history

Change-Id: I0a04c301bc088d45d3c7cd329620119edb5b88ed