Remove use of deprecated Diff class aliases

Change-Id: I28cc2a7aed2a20abbfa7c076c659a248f39a5b6d
Merge "Remove use of deprecated Diff class aliases"