4075f17c2d
This reverts commit e77eafc263.
Reason for revert: b/207684378
Bug: 207684378
Bug: 199160559
Change-Id: I4a35fea423f1cd7afae4603fd1185150763f8bf0