Bug: 243344927 Bug: 232285403 Test: build and flash Change-Id: I4cc204c9237f017126a52cb12da5891671f248d6