Merge "Merge "Update device policy APIs after linter fix" am: 0eb6bb9281 am: 41f045d4b3 am: abda4584b0"