Merge "Define stubs_defaults for the new API surfaces"