This reverts commit e70b57a6. Reason for revert: b/72482083 Bug: 72482083 Change-Id: I36b0aff6d533d7fb59d367a1cd4e96e03df5f462