Bug: 73804944 Bug: 74375666 Test: make -j 50 test-art-host Change-Id: Iba4eeedf254f85db7fd763c9208120feea047f13 Merged-In: f0e3d9fc (cherry picked from commit f0e3d9fc)