This reverts commit 1244815e. Bug: 71555179 Test: make Change-Id: Ibfd97660e5f91fc7fac13b66efa8aa587ba20b4e