Bug: 64382372 Bug: 76138670 Bug: 76165623 Bug: 76112393 Seems to cause run-test issues. This reverts commit eefabd28. Change-Id: Ia9b3d946742dbfde4fb56cf14413fde0600c8252