am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev

* commit '301e95f2e17164c6f432f1b68f55e5f12aa0ca78':
  Add a little more resource load tracing.