Merge "Add shell permissions for CTS testing"