Merge "Disable test that is killing the presubmit." into tm-qpr-dev