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

Change-Id: Iaed0d9913882e86d63c2279c2d7dbf3f18d5f948