Merge "Device Owner, a special kind of device admin" into jb-mr2-dev