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

* commit '15240ce41187e8780596e611ea684b57bedbfe53':
  Fix TODO on instrumentation and add some more DCHECKs.