Merge "Merge "Allow config of wfcSpnFormats to use root locale" am: b9c01155 am: af72e460 am: 805f4e77"