Bug: 32510706 Change is not responsible for the flakiness after all. This reverts commit af3572bc. Change-Id: I399049c217deeac6a5c3f9d678a46bdb84386e3f