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

Change-Id: I78785e6eb0aebc8ee5fc94fa17a626835cfd56d8