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

* commit '73f24ae1d9992cf70cb05bc319d12478b2c49566':
  Don't update global table when upgrading secondary users' database.