Temporary workaround to unblock tests. In a follow up, we need to ensure that we're not querying live instance to avoid unnecessary issues with tests. Change-Id: I427f7a694b84c92bfa4d9e8a721ce65ae1e94687