Merge "Fix warnings from static analysis tools(system_nfc-1/2)"