Bug: 242203678 Test: pass boot test Change-Id: I1202aef4de0cb306286514244510c59e5b2c0b34 Merged-In: I72f70e7fbe8af84bfb70d21469a2d7981b868fd2