Merge "NFC DTA Integration" into oc-dr1-dev