Fix null check for BaseObj.equals.

Change-Id: I4f060697db175cbf0b5617c1220db853bbe53f1f
Merge "Fix null check for BaseObj.equals." into kk4.4