Merge "Remove the unnecessary warning log" into tm-dev