Update refs to Diff classes

Change-Id: I97249519a936233a547dcc8f2ea3d2af3f702d93
Merge "Update refs to Diff classes"