This reverts commit e35ac04a. Bug: 123510633 Bug: 127305289 Reason for revert: b/127305289 Change-Id: I18c2d9291411b31641333c14c47da8c4fdf317f7