Bug: 74039047 Test: make cts-verifier -j32 Change-Id: Iaca4e043443efeb695ebfd57c605e5cc1516a49a (cherry picked from commit 3c9e79ea)