This reverts commit b06ae3bf. Reason for revert: b/74726495 Bug: 74726495 Change-Id: I4bce8df13f9fa9e1b420382f7a96f9855510196f