Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev