Merge "Replaced Equals/HashcodeBuilder for DatapacketListener"