This reverts commit 12dcc864. Reason for revert: See b/314904106 Bug: 314904106 Change-Id: Icb048d86a66a5f0492c3ae017314f4cdcd3ffabe