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

Change-Id: Ie482af3910e243dac4f79da875a1c53970553ca9