Bug: prod db contains rows with both *_user_id and *_user_ip set

Bug: 71858
Bug: 73153
Change-Id: I3d78cbeb7313769c3c10c67f68fdbd52531d8f8f