Merge "2 tests sometimes timing out on gcstress/debug."
am: b072ec25f8

Change-Id: I89efdcd6d886c5dd49cad9c30b0b7e36fc03c39c