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

Change-Id: Ic3a09fd11aa54361ce5fa43fc4c691b4d02c47ac