This reverts commit 1f3e81f2. Reason for revert: b/276271241 Change-Id: I3932d1d58f0eaa4751cfd5255dec88d260d09f20