This reverts commit 5548bf30. Test: m nothing Bug: 299570421 Change-Id: I9f70648fb6657bbf4f5681cd6d40517d70a8fefb