This reverts commit 559ad01d. Reason for revert: broken builds Change-Id: Ia8a09a2bdbdc8e76f2d4b9eb54e36ccc544e9397 Bug: b/148181875