Merge "Merge "Fix: some flagged APIs are not recorded." into main am: 9750a10449 am: e9d3847cb9" into main