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

Change-Id: I54e0fbf0b0efcd818ecefcba6fda48e1397be85a