Merge "Nfc Verifier: Edit error message" into nougat-mr1-cts-dev