Merge "Handle @sdkExtSince"