Merge "Merge "Allow config of wfcSpnFormats to use root locale" am: b9c0115518 am: af72e460a5 am: 805f4e7799"