Merge "Go to suspended before waiting for GC to complete."
am: 95c7d5b995

Change-Id: I34b9b8a469b5353e1bd63d9ec4291d0e05827b1a