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

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