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

Change-Id: Id3cb512e9f200a90b07eb45249231ac98458fa18