ec79eb9cbc
This reverts commit c1ec2d4260.
Reason for revert: broken build b/207126572
Change-Id: I0908e8e6579bc54c6ce1dff88bddf8b030f336d9
Fixes: 207126572