Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev