Merge "Update log level for warning" into tm-dev