Merge "Put sdk_version in module stub defaults"