Merge "Fix lint docs breakage."