Merge "Revert "Ignore new test until prebuilts are updated."" into tm-dev