am 9fe49fc5: am 523db46f: Merge "Set subscription_mode in the database to a default value"

* commit '9fe49fc56ef39facf7b3be5f66256bd15a87961f':
  Set subscription_mode in the database to a default value