Merge "Don't diff records / enums already diffed through referenced type diffs." am: 336b2ecfbb am: b8a122ab60
am: 688404f04f

Change-Id: If86b30d89883e9cdc6a06d28e59e4aa65771d997