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