BUG: 78252157 Test: Local build and boot Change-Id: I088c1efbae56d94cc740f68bb9981f550c494868 (cherry picked from commit 6a219039)