Merge "Minor cleanup of Monitor::VisitLocks"
am: 4ba3766449

* commit '4ba3766449e4c36478ed896ee6d2ad9e9ee43f74':
  Minor cleanup of Monitor::VisitLocks