Merge "[DO NOT MERGE] Fixes boot issues on Headless (HSUM) related to ag/25382994" into udc-qpr-dev