Add disable_configstore am: 775bd7cb9a

Change-Id: I88221bb27d148bf0c4af08f264c0bbff43803137