This reverts commit d9478e1c21. Reason for revert: breaking build. b/293539702 Change-Id: Ie8a66971fcf249c9d08b4898e24b962d6aaf3ce6
d9478e1c21