38bc885de9
This reverts commit 170306d54a.
Reason for revert: Cause of b/332673787
Bug: 321291049
Change-Id: Id5ae99d28a7497debaabbc5ed09cd18f9c253750