Merge "Follow-up 83ec590: Add new updateExtensionJsonSchema to autoload"