This reverts commit 2b1b3b28. Reason for revert: b/177065099 Change-Id: I0ac8d525c9f36ace5e65ffb2305f75fef0b6dc65