Merge "Merge "Re-submit "Change the default docs build to use module stubs"" am: eb2333936e am: 643efb7cfb am: d006973d90 am: 4a567b1f0a am: 2ed2a1419d"