827335f209
This reverts commit 1cb868e2f7.
Reason for revert: The problem still happens
Bug: 195319692
Test: presubmit
Change-Id: I468c84af743f04f440b719a561e4e5dd6adbf3b4