Bug: 238570971 Bug: 238571324 Bug: 238571420 Test: presubmit Change-Id: Ib24d85aaed87e6e5dc0b0281d65407e8c45e017c
Bug: 242203678 Test: pass boot test Change-Id: Ib50c5aed2787d068e589491373a75de47cbe48ee Merged-In: Ifa7de8df3b09eabee7df8008dbb381854e18f48f