[automerger skipped] Merge "Add disable_configstore" into rvc-dev am:...
[automerger skipped] Merge "Add disable_configstore" into rvc-dev am: b7eaa14f -s ours am: b5631447 -s ours
am skip reason: Change-Id Iac01bb375a5c4080c0e110213c64041ea823ed68 with SHA-1 775bd7cb is in history
Change-Id: I187d712738a4c840319669fe11dd4be40c63af44