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

Change-Id: I29bf12f840c4626d0b6a514bfbd9ff24efa10bfb