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

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