am 8377a4fd: Merge "Fix null check for BaseObj.equals."

* commit '8377a4fd03d4fc367e0cb07af748ae941d9960a9':
  Fix null check for BaseObj.equals.