Prevent type errors on unexpected diff types in changes.

Change-Id: I08ebd11da8b737900afb3f5a37b770ea725b8f4e
Merge "Prevent type errors on unexpected diff types in changes."