We have had some uncomitted changes in the analytics repo, which is a no-no.
These are the uncomiited changes which were authored by me, so I am
comitting them. Both of them require further action to fix root causes
which I intend to work on now.

Test Plan:
none

Auditors: eliana