Merge "Update the format of RCS provisioning config XML"