0584c86ce6
This reverts commit eb65ca1600.
Reason for revert: test fixed with ag/26635495
Change-Id: Ic6b131f7a50e8b4f651b601cdf30304ce587eb5d