BUG: 79414212 Test: Local build and boot Change-Id: I4309e49d6aed5e55b5ae24b9bb545d9099875e52 (cherry picked from commit 33c905ec)