Merge "Clean up permissions on demo"