Test has flakes. Bug: 31455788 This reverts commit 672a0b75. Change-Id: If00ecbd31abe204bcaf8341eceb674e07c0ac8f2