Merge "Fix warnings from static analysis tools(system_nfc-2/2)" am: 00b0b8d1b7

Change-Id: Ifd3b0fa88b986925365989451d340ad826f1f366