646a1eece59a67df78c1aa18dbd4ffbc76956218
This reverts commit 75eef5c3a3.
Reason for revert: Temporarily revert this because of b/272424659, b/259697096, while we are discussing another fix ag/21942341
Change-Id: Ib6a7e9cbede2a818433e67315affc60607146d55
Description
No description provided