Merge changes I5dc95aa5,Ib2c1e4ad into mnc-dr1.5-dev

* changes:
  Add spnOverride entries for EE WFC
  Set wfcSpnFormat for EE WFC