[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: fe0bcf4a -s ours
am skip reason: Change-Id I1c08bd7b18fe6006ee1555c39072e75ec4fb3210 with SHA-1 eaa9a5d1 is in history
Change-Id: I91e1cf35863afa53de9556ef2c387600d33894cd