Merge "repo_diff: workspace mustn't be in existing tree" am: 36f1452bd4

Change-Id: I7c86b1b19e23da89e60bbb1176a17e0c76863182