Merge "Fix TODO on instrumentation and add some more DCHECKs."
am: 12cbc87247

* commit '12cbc872477dd278a27599d8714381657211b184':
  Fix TODO on instrumentation and add some more DCHECKs.