am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev

* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
  Fix admin policies in managed profiles