Merge "Revert "nfc: Fix build failure"" into main