am 887e7bb7: am d67c70c5: Merge "Fix enterprise path permission checking" into mnc-dev

* commit '887e7bb76379f8d49215e3bb310ff24f0d2478b0':
  Fix enterprise path permission checking