Merge "Apply non-FBE migration early during boot." into nyc-dev