Merge "nfc(api): Add OEM extension surface" into main