Merge "Go to suspended before waiting for GC to complete." am: 95c7d5b995 am: e764e409b5 am: d888853e7e
am: 11f0402210

Change-Id: I6b2e6df02168319bf84c9954527247ba63ed8372