Merge "Removing logs for b/237743330" into tm-qpr-dev