This reverts commit 7529b207. Reason for revert: b/276599346 possibly slow down coverage build boot time Change-Id: I87dbf23f4ed9dbadaa947f01edbb92a4a01e3dca