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

Change-Id: Ifbe7c4e9482b193dad8467ff62e2c900f6c1138c