This reverts commit b81c3d5f. Bug: 77297012 Change-Id: Ie8727343650b549d4f438643d50a10fe50ab52b1 Reason: this change is breaking the build