[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 -s ours am: 794c3efe -s ours
am skip reason: Change-Id I1c08bd7b18fe6006ee1555c39072e75ec4fb3210 with SHA-1 e344d058 is in history
Change-Id: Ibefb02d7e684d40a1a825f17d185cffd5e00a286