[backfire] merge r28198