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

Change-Id: I6b76d984ae838f29819ceedb6b8769e4fc0956ed