cfcb27aa9d
This reverts commit 9cf28d1772.
Reason for revert: Fix in ag/32425180
Change-Id: I714665944384db6f68634de529272e618bccdad9