Merge "Fix Identifier.equals method."