Merge "Fix some typescript incompatiblity with google3" into main