This reverts commit 24d888e7. Reason for revert: For diagnostics. Bug: 73060923 Test: none Change-Id: Ia33f761c8b62cfe9e430a0228f88e40aa1728114