Merge "Fix device administrator "add" logic"