[automerger skipped] Merge "Configstore is optional on updating devices." into...

[automerger skipped] Merge "Configstore is optional on updating devices." into rvc-dev am: c5a65243 am: cf02f2f6 am: fc38c028 am: 8548cbb3 -s ours am: 4df6495f -s ours
am skip reason: Change-Id I1c08bd7b18fe6006ee1555c39072e75ec4fb3210 with SHA-1 e344d058 is in history

Change-Id: I9a482c75b415a95b1dfa091733e2cdd8a57e668d