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

* commit '55e80dcd5ba22801024eba45623893643aca2e11':