This reverts commit 0acab2532d. Reason for revert: b/290403189 Change-Id: Ie3f67f78a8ffce8c2d5a92f65a7e74d788c82a81
0acab2532d