Merge "Re-submit "Change the default docs build to use module stubs""