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

* commit '9a1473406f634ea541bd1643dc70d9aae8c10e77':
  Don't update global table when upgrading secondary users' database.