Merge "Allow app downgrades" into nyc-dev
am: b0f6e311ce

* commit 'b0f6e311ce19add792048db855844e542e808dd6':
  Allow app downgrades