am aa19a2f6: Merge "Don\'t compare String8s to NULL."

* commit 'aa19a2f69c33fdb6499d0bc1cfafced9f572da5b':
  Don't compare String8s to NULL.