This reverts commit cbfa33fd92. Reason for revert: b/317131577 Change-Id: Iafd9dc574c59f627b049ad7a955173d562d1444e
cbfa33fd92