am ccc95132: Merge "Use ConnectionManager to restart loaders" into jb-mr2-dev

* commit 'ccc951329c261f2986c2b086149ba3bce568d393':