This reverts commit 2337d538. Changeset is incomplete and triggers debug errors. Bug: 111969862 Test: n/a Change-Id: I74b5feb054403696433be24147b5484f2c3d27e9