Merge "Revert "Stress profile saving for gc-stress tests"" am: ddeeaea1c7
am: 2961ea2f28

Change-Id: Ief8c572944846f58588708506c9b32b36ad1fb43