e8aa9a383c
This reverts commit 7a14d1b7b9.
Reason for revert: b/383084557
Bug: 343882478
Change-Id: Ia9b13964df7d85cfee441f4163f41e198c283021