am 1e6cd17f: am 919d56f9: Merge "Always set permission policy to fixed" into mnc-dev

* commit '1e6cd17f5abde2e6dd9a28021af5edc977c5b430':
  Always set permission policy to fixed