Merge "NFC DTA Integration am: b5456781 -s ours am: 3cf0b692 -s ours am: 58a611b3 -s ours" into oc-mr1-dev-plus-aosp