Merge "Increase customization options for wfcSpnFormats"
am: 34721e16a0

Change-Id: I5220f302d60874b160177874fc863b79bb46e978