This reverts commit 8196fd93. Reason for revert: b/74214574 Bug: 74214574 Change-Id: I9602872238ccc8a49d8b200e5389995d597f1c3a (cherry picked from commit 00b4fa8b)