Merge "Tweak the defaults of module stubs" am: b5997d270d

Change-Id: I58560b8474aa907a99e6a8f1c38e3e364e832086