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

Change-Id: If54ec31a84bb75601cbc46b785b341f4bab10bf0