Merge "Minor renamings in DevicePolicyManager" into tm-dev