Merge "Add instrumentation test support to app_profiler.py" am: 2083cfad2c
am: 1e80b276b1

Change-Id: I0f5734f492986cb681aa8bcebc8e43b4b696356a