Tentative, will monitor bots if flakiness is fixed. Bug: 22720414 This reverts commit 18656fef. Change-Id: I53b645b73207ccd21cad6ddac1de483bcc158794