Merge "Minor cleanup of Monitor::VisitLocks" am: 4ba3766449 am: 8c9b6fe884
am: f6052da1da

* commit 'f6052da1dad5a56c6db65e2bbe76d0128262da83':
  Minor cleanup of Monitor::VisitLocks