am 9132bd12: am 2a3611fe: Merge "Fix null check tests"

* commit '9132bd121ddfcd93272a0d00a9a9f83fee2abd3b':
  Fix null check tests