Merge "NFC DTA Integration" am: a42c8a1667  -s ours am: b9d0a22aaf
am: cee0ac5fca  -s ours

Change-Id: I711d3a31445d3fc694b0289fa9323d5220abd713