Merge "Add a developer option to increase nfc stack log level"