Merge "Support comparing separate workspaces" am: efe63418b7
am: 3020a238e1

Change-Id: Iaebf79a72ecd1556bab28b89eca79e6af17d331e