am 4db08b04: am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."

* commit '4db08b044dfbd01912353f0c85a43973407d98b0':
  Fix null check for BaseObj.equals.