Still flaky. bug:28988206 This reverts commit 06cb9b25. Change-Id: I13626a8959db27fd566f6db56fab469312422e70