08f3d4d675
This reverts commit d8ad6b25f4.
Reason for revert: b/185382799, b/185383656
Change-Id: Ie500fd5c4f2937df56fbd8afe5556f1a71b90d87