[automerger skipped] Merge "Configstore is optional on updating devices." into...
[automerger skipped] Merge "Configstore is optional on updating devices." into rvc-dev am: c5a65243 -s ours
am skip reason: Change-Id I1c08bd7b18fe6006ee1555c39072e75ec4fb3210 with SHA-1 eaa9a5d1 is in history
Change-Id: I178a62b12691f2598695ffd21240fb6ae56cf860