Merge "Update profiling code for host-side tests."