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

* commit 'd67c70c551749929f2fa845279b554132bf992f0':
  Fix enterprise path permission checking