Merge "Inject auth token into tags"
am: f7fbbbfcc9

Change-Id: I18c095a424372614abb8d6a87f36889a032a4019