Merge "Register tests for profiling after the runtime has started" am: 65466b5a78
am: 329deb93a6

Change-Id: I64a307189a6f577646efca39475701cf6567dcfc