This reverts commit 162a85e777. Reason for revert: b/406430367 Change-Id: I1be60513d8f034d6aab9489a95f98a7a0f16d26d
162a85e777