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

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