am 44ee4164: am da1ae37b: Clean up SIP-specific TODO comments.

Merge commit '44ee416419654bf3c1bceb035e66ea9ff9dfb89c'

* commit '44ee416419654bf3c1bceb035e66ea9ff9dfb89c':
  Clean up SIP-specific TODO comments.