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

Change-Id: I2f016500b673ada62f915b5117b91f8efe358401