Merge "Update configstore entry to 1.1."