Merge "NFC DTA Integration am: b54567810f  -s ours am: 3cf0b6926f  -s ours am: 58a611b3a2  -s ours" into oc-mr1-dev-plus-aosp