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

Change-Id: I6edab80bee45eb4f95a36273857068487ff506b7