am 31f114b6: am 46ae3b96: am 4a7d279c: am d06b5be4: am a5f831ed: Merge "Fix permissions." into mnc-dev

* commit '31f114b6493949c7204cb4667850c66ccae6ffaa':
  Fix permissions.