This reverts commit d86c5657e0. Reason for revert: b/281294745 Change-Id: Ib2680b60346a9bc5932057707d0ef105441f324d
d86c5657e0