This reverts commit 335025f2. Reason for revert: b/132437551 Bug: 132437551 Change-Id: Ie7d615b2e721d2db7c9a8b772212d6efcc12d991