Merge "Add correct permissions check for GTS testing" into pi-dev