[upstream] Bring forward lo patch.