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

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