Merge "Remove wrapper for device policy manager" into pi-dev