Merge "Make hal_configstore consistent."