This reverts commit e4631eb1. Reason for revert: b/291952939 Change-Id: I60410456f71e5e39fdbf3b4ac30e216dbd4ec99c