Merge in third cherry picking.

20 jobs for trunk in 1 minute and 36 seconds (queued for 7 seconds)