Revert "Call equals() comparing different types"

MSIMS....

This reverts commit 9055fab66db8a63760db4aae9552373637877086.

Change-Id: I424ba3c6f84312dce803967fcc741794a689cf1b
Merge "Revert "Call equals() comparing different types"" into pac-4.4