Merge "Use auth token from intent extras" into qt-dev am: 172d03c758
am: 67459a21ff

Change-Id: I940af9acacf470b30c2225efa34cdcf35275c9b2