Don't use EntityDiff and ItemDiff class aliases

Change-Id: Iec0e975d7fb960b62768ca032e9a80914e3d80e7
Merge "Don't use EntityDiff and ItemDiff class aliases"