This reverts commit db37a06c. Reason for revert: This CL was reverted by mistake Bug: 263565738 Test: Compiles Change-Id: I890e44a73b108501b830625eada68322ef63e192