See merge request tumult-labs/analytics-upstream!460

Approved-by: Amritha Pai <amritha.pai@tmlt.io>
Upstream-hash: 9ccc1ad2e70fb3b3280bf4a3040926f26776a3b2