Merge "fix static analysis warnings related to CHECK_MEM_ERROR"