Disable profile/code coverage until tools are merged.
Merge branch 'upstream-master' into import-test