This reverts commit 59de280a. Reason for revert: Broke mac tests Bug: 235624976 Change-Id: I358bb14ec565f106483378f4798e3fc88c491f8f