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

Change-Id: Ic6b4dd8b863c8aafc93cf670e448103ce5d5ad02