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

Change-Id: I694ac1aba965849f5f4bd59b3d7bd61bb60da4e6