TEZ-1772. Failing tests post TEZ-1737. (Jeff Zhang via hitesh)

(cherry picked from commit 1a3059f41820ce91acc9eeb3b8c30fb4b53ea2b5)