Merge "Fix HierarchyViewer so it can load Contacts" into jb-mr1-dev