This reverts commit 4b3dec38. Reason for revert: Failing on debuggable-gcstress Bug: 62821960 Change-Id: Id143ffa2d9c379566328a03f3cbce1713ae31e51 Test: None (cherry picked from commit fc49fecb)