Merge "Add permissions to shell to enable testing"