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

Change-Id: Ic3959f677f54788958f9ad7a82f7e6abea8ae8d1