This reverts commit 48c42107. Reason for revert: b/275032356 Change-Id: I129d1d9876542ba152e07664ad08acfb0425f24a