This reverts commit 299b3302. Change-Id: Id887bd37f8f7b0c1ff48c339c9d59491f65cae84 Bug: 35925915 Fixes: 66067974