Merge "Update device policy APIs after linter fix"