Merge "Fix RebaseIfNecessary submit strategy" into stable-2.6