Merge "NFC DTA Integration" into oc-dr1-dev
am: f8469ccf17

Change-Id: I8acca990e6191360fc3f4f9c668f74d7a06d6a52