am 34ea500b: Merge "Handle db upgrade for non-Sprout devices to match Sprout devices." into lmp-dev

* commit '34ea500bee5828f1dbd0e19d31d91aa1e979382a':
  Handle db upgrade for non-Sprout devices to match Sprout devices.