Merge "[stable/{train,stein}] Use old guest image for these branches"