169c4e88cd
This reverts commit 5f80e92bda.
Reason for revert: We need to see if this has caused b/196586808
Bug: 196586808
Test: presubmit
Change-Id: I078f0d4e83f5f1db19e9e0a5afec4f3058156745