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

Change-Id: Iacdb49af09e9935f15231a83be0aeb2de7502f93