This reverts commit c7e853f511. Bug: 33895226 Bug: 30984614 Change-Id: Icca320e02651b7dd7b8db84ab414f41edee32760
c7e853f511