Merge "Configstore is optional on updating devices." into rvc-dev