Merge "Clean up string description for NFC disclaimer dialog."