Merge in NFC config changes from S4GE and adapt for host based CE

Change-Id: I02b8994c173ab8a6b1345af6442ef28a20f4c6de