Merge "Fixes to M permissions." into camera.lnx.1.0-dev.1.0