Merge "Fix null intent handling" into nyc-dev
tree: 19d9c818a20158cef85d284334f54b58a7978662
  1. service/