This reverts commit ca1a96d3bd. Reason for revert: ToT instability. Bug: 280112517 Change-Id: Icef303545cbef7884c2ae81bd9b9d5fd94ea42ca
ca1a96d3bd