Merge "NFC: Directly initialize the 's' variable."
am: 566c24cf55

Change-Id: Icabab8defd8affdd8b07251e643e2ae34aa8de1f