Merge "Tweak the defaults of module stubs" am: b5997d270d am: 99703f7876 am: 4b25e18122

Change-Id: Ic42f208573b2219bd096821d4f92af9621b93930