fa8d8985b9
This reverts commit 67d7be9c36.
Reason for revert: test failure is fixed
Bug: 215233405
Change-Id: Ic16c0ed590c9922ff659489ac6ec09d893b60557