Fix NFC regression

 Bug: 7263536

Change-Id: Ieba6147fdc0279888ec1e6ea2101eab235522b9f
2 files changed