This reverts commit 9c74c744 Reason for revert: b/186804505 Bug: 186804505 Test: presubmit Change-Id: I055f4075ac7728dfed5877286624a9600c90a38f