Merge "Fix boot loop problem for volantis." into nyc-dev