770cc42685
This reverts commit a2a1f86dff.
Reason for revert: b/154068414
Change-Id: I1db0018fa97d5a5380651cf7d04a05a0abd62857