Merge "Fix bootloop in x86_full." into nyc-dev