Merge "Add more verbose logging to profiler" am: 1cc5dc8f0c
am: 13e1969aed

Change-Id: I18629e8c00745ae56eda2fa2791836f9175f0d18