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

Change-Id: I08eb378443b8f0fb41fc8a4f9439dd2827d6a20e