Amend previous ndc commit

Submitted wrong patchset. This includes the delta for the latest
patchset.

Change-Id: I30f8fa1503cda2459ec7284eb9fa199c9fd5ef9b
1 file changed