Merge "Make waiting for blocking GC more intuitive"
am: ec5a7cce55

Change-Id: I84aefc73b1365ea6836b1df14d8ac13dfd4294ea