This reverts commit 48d68a64.

Bug: 31364540
Change-Id: I2a83b661e06c84f42c0a7aa566f02d2c135b96c3