[backfire] merge r28298