Merge "Adding some permissions to Shell to enable testing"