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

* commit '2d66b50b00603e1b54da45aa1129e6bc659fd46d':
  Clean up permissions