Merge "Merge module-lib-api-stubs-docs and -non-updatable"