Rollup of internal commits, to r629