This reverts commit 304db43153.
Reason for revert: This CL broke a test: b/153606760
Bug: 153606760
Change-Id: I6034fad7f88de14518ea9f46bf8774e4b8196926
This reverts commit 304db43153.
Reason for revert: This CL broke a test: b/153606760
Bug: 153606760
Change-Id: I6034fad7f88de14518ea9f46bf8774e4b8196926