[automerger skipped] Merge "Add disable_configstore" into rvc-dev am:...
[automerger skipped] Merge "Add disable_configstore" into rvc-dev am: b7eaa14f am: 5c016eed -s ours am: e17cc34f -s ours
am skip reason: Change-Id Iac01bb375a5c4080c0e110213c64041ea823ed68 with SHA-1 11a113a6 is in history
Change-Id: I910db6eaf616615a45e6f039f450c2325d1e5030