This reverts commit 808e22ea. Reason for revert: b/249575831 Change-Id: Ic36d84042216f42bed7122b1cc355100cf542f3e