Fix NFC: kanged from kevin

Change-Id: I49222f56af4d1ca092e14411df63be046592ac00