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