This reverts commit b013a475eb.
Reason for revert: b/199246839, breaks some builds
Change-Id: If71cb271c6f4bb32f3cc9b31822fa0b9dbab7c37
This reverts commit b013a475eb.
Reason for revert: b/199246839, breaks some builds
Change-Id: If71cb271c6f4bb32f3cc9b31822fa0b9dbab7c37