Merge "Configstore is optional on updating devices." am: 9a260cdbb6 am: 349c9a5ffb

Change-Id: I3d0addf52d817ef5db93be2da5951ad97799270c