This reverts commit 638778c654. Reason for revert: b/187884708 Bug: 187884708 Change-Id: I60e80246345ca3e827d7b4749f25e2d5c4dddf9d
638778c654