This reverts commit 6c5f36d3. Bug: 64382372 Bug: 74963051 Test: N/A Change-Id: I8dc2b19c5d1ceee051791b639f30a1175b373117