Merge "Add instrumentation test support to app_profiler.py"