bacon: Update NFC configuration

Change-Id: I3a29c6f6d950f191cc755a8e27a9a052017c32dd
Merge remote-tracking branch 'cm/cm-11.0' into HEAD