This reverts commit 92b0e4b0. Reason for revert: b/180733743 Bug: 180733743 Change-Id: I57095c6b5ca0c06d1c73bb60b7879e58b8fc732c