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

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