Merge "Add more info to monitor contention logging" into nyc-dev
am: ad0b769

* commit 'ad0b769e15eeb62963d543811a960deb6f309adf':
  Add more info to monitor contention logging

Change-Id: I632a0ca6630a1b566efa08441a563d0a7fe0a7ff