1be8a17986
This reverts commit fdaa12d028.
Reason for revert: Should be fixed with ag/11252279
Bug: 150958400
Change-Id: Ia61462239ad5d8aba502bc8513d685046c1a1361