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

Change-Id: I20e0b61f2fb6a40864d90232550144fbe5680554