am dbb03371: am 6e761c5d: Merge "Device policy: use owner label instead of name" into mnc-dev

* commit 'dbb03371cea085f06de3e9cfb255efaad9a97d4e':
  Device policy: use owner label instead of name