Incorporating review comments.

6 jobs for !142 with abpatil/tenant_info_doc_cache_impl in 52 minutes and 43 seconds (queued for 14 seconds)
latest merge request