Merge "configstore: make consistent with AOSP"