Merge "NFC: Directly initialize the 's' variable."