Merge "Fix boot failure on aosp_pixel-userdebug"