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

* commit '912f01865ab879314ac86dc9a61b62e2e7bd5911':
  Don't update global table when upgrading secondary users' database.