For ENG-5048, clean up debug log message basd on Ning's feedback