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

Change-Id: I024c1929515f514746c9e74369a259d231036b9b