Bug: 261105164 Test: boot with no relevant error on p23 device Change-Id: I8d897693685591a042c5febfeca0121375749b8e