Fix ubuntu diff repository structure

Change-Id: I2e4a37dd87769af10a3cf2a4dfeff01c0f1bafcb
Merge "Fix ubuntu diff repository structure"