Merge "Merge "Update lint checks to their state on internal master" am: 771f94f7 am: 75575edd am: 128dd429" into udc-dev