This reverts commit 7ce68379. Reason for revert: b/238405276 Change-Id: Ifcd1c02a3d4505af090cc1cd187730aa959fc463