Merge "Null check for restoring LoaderManagers" into nyc-mr1-dev am: 6b87569b4c am: 780da3b704
am: 6b5f966c2f

Change-Id: I224d47c1b17b956a0d62b27e3ba9f07b44eebe8e