Merge "Fix typo in DevicePolicyManager" into nyc-mr1-dev