Merging as a separate CL due to a log showing up related to this on hwasan (is a prebuilt pulling this in?) Bug: 276813155 Test: boot cf Change-Id: I19f7fc51c937d0eb1ee17781fc5d201a0972c4b0