Merge "Inject auth token into tags" am: f7fbbbfcc9
am: d54f6afbe2

Change-Id: I82e480929b37c5a35907af8186fefe83b73dd909