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

Change-Id: Ic8dee5078c3d977052c5ec4151013bc57358548f