am 92908994: Merge "Fix bogus define checks and a typo."

* commit '92908994dc413f259f5ba2e1f4a4bd217c9e6cf7':
  Fix bogus define checks and a typo.