Merge "Don't update global table when upgrading secondary users' database." into jb-mr1.1-dev