Fails on gcstress. Bug: 62611253 Bug: 76454261 This reverts commit e37dc6ee. Change-Id: I796e3839fc17f15de1bfa03825bd83358a1ee7f6