Merge "Null check for restoring LoaderManagers am: 100ba76d7a am: bb2011a2e0" into nyc-mr1-dev-plus-aosp
am: 825c6e0dde

Change-Id: If44677fb02562e23bd7a93a75a1c6c1d8980d558