Bug: 30951794 Still flaky. This reverts commit 1132d63d. Change-Id: Ib00bd5083bb05dd26dfd957eafd1288a659703fb