This reverts commit fc21a0e5. Reason for revert: broken builds/tests were fixed Bug: 241011085 Change-Id: Ifba0bb05e690c8204e3ef34f59d7bf7ef57638ed