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