Merge "Fix broken build due to missing imports in device owner transfer functionality."