Merge "nfc.default: remove unneeded dependency" into oc-dev am: 19e18b3d0e
am: b2e7fd4712

Change-Id: Ic7a2d890fea36f046513fb48935af8fa96095777