Fix flaky test. Bug: 25641543 This reverts commit b52a39c7. Change-Id: I6b0d3087dba3680252e65af554530e2769cde55c