am da1ae37b: Clean up SIP-specific TODO comments.

Merge commit 'da1ae37bd6c81e66ac8865593f5c6477ee7697ab' into gingerbread-plus-aosp

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