This reverts commit 2870455091. Reason for revert: b/308368520 Change-Id: I512fa574e47585f0005ccc6c3790c0c20a3a4c55
2870455091