This reverts commit ad9bbd8c. Reason for revert: Used by IORap b/179618216 Change-Id: I3eeb9cd1777a9c2c7ab71314d4019d9a499b732f