This reverts commit d4c9489b. Reason for revert: b/290300359 Change-Id: Ib883ae52c9e8656b7d5b5a9a0f75f79115edebb0