Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev