Merge "Temporarily ignore odd presubmit failure" into tm-dev