Merge changes Iab0ffbb5,I2cbe9906

* changes:
  Revert "Disable tests that depend on the prebuilt version in U"
  Disable tests that depend on the prebuilt version in U