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

Change-Id: Ibd691f8027123ba262807faae3696aeeeb91971f