am 6ce17205: am 2d66b50b: Merge "Clean up permissions" into mnc-dev

* commit '6ce17205d1bc6da62b196fd08d5bfd1b0471557a':
  Clean up permissions