am 2a44d27b: am b145ac12: Merge "Fix document management permission enforcement." into klp-dev

* commit '2a44d27b1d90239e3a71386f55632ed8017b1cc6':
  Fix document management permission enforcement.