This reverts commit 8d9e468dbb. Reason for revert: b/281179368 Change-Id: Ibfc5329f72cdbcb37d01a8bf3dac2ba0724b9faf
8d9e468dbb