This reverts commit 952400d2f2. Reason for revert: b/267743311 Change-Id: I007274cdea1c424c87ddea4592e9e1c7a273bea9
952400d2f2