b5057c496a
This reverts commit 1a2462914d.
Reason for revert: Likely culprit for b/286115393
Change-Id: I613ca9f62c5b9f43f2e3cd240e45bc1a0db0e661