Merge "Fix failure on mounting system_ext partition"