Merge "Database cleanup needs to happen for all users." into jb-mr1-dev