FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
Merge "FindBugs: Call to equals() comparing different types" into cm-11.0