[automerger skipped] Merge "Add correct permissions check for GTS testing" am: 951fef3680 am: b3e46474de  -s ours
am: ef8cc80c3e  -s ours

Change-Id: Icfa841ba3fc8ac885b4985541350224be53bd22a