Merge "Update lint checks to their state on internal master"