am 2a3611fe: Merge "Fix null check tests"

* commit '2a3611feeb12bd73ccdbb4692f9ca3705f925d56':
  Fix null check tests