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