Summary: Looks like the change D36035 inadvertently broke the build. Fixing the bad merge instead of reverting the huge change.

Test Plan: Jenkins pipeline

Reviewers: svarshney, #yba-api-review!

Reviewed By: svarshney

Subscribers: yugaware

Differential Revision: https://phorge.dev.yugabyte.com/D36071