am 377c6fd7: (-s ours) am a5f831ed: Merge "Fix permissions." into mnc-dev

* commit '377c6fd72c6edc558ac6c8209a2a5978bc62f537':