[ROLLBACK TESTS] LPS-36418

cc/ @shuyangzhou @brianchandotcom