Merge "Remove API level mentions from typedefs" into main