f9650bd236
This reverts commit a7821390e2.
Reason for revert: b/354648445
Fixes: 354648445
Change-Id: I069d6d72a59ec273e8b7776512ef9015bdb862c0