Merge "Move basic tests from postsubmit to presubmit" into tm-dev