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

Change-Id: I85c671b6fd0e7907ccee4cd78508c583c887f7d8