gerrit:135405 is a very simple change. Please review it.
Otherwise, I'd have to rework some parts of 125575.