Merge "Add a little more resource load tracing." into jb-mr2-dev