Merge "Use single macro and single trigger word for all every-patch jobs"