[backfire] merge r28225