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

Change-Id: I3ec24a57b6f4da270926a6b6b2f0f231d6d703f1