This reverts commit 2f5496582d. Bug: 296329753 Reason for revert: broken build Change-Id: I9336cebf8d4947450f5d3e2f0ec4df839aca3574
2f5496582d