This reverts commit 596e4fd4. Because the root cause has been identified. Bug: 175954493 Test: presubmit Change-Id: Idcde497ffee1f10a4289520e154aa8b39eed1f78