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