am 143e118f: Merge "Make grant default permission more robust." into mnc-dev

* commit '143e118fa90bbeb8cf558ec0d303639d15ee7db7':
  Make grant default permission more robust.