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

* commit '8c9b6fe8845a31ef4f6f4c85370dd1bdcf65d742':
  Minor cleanup of Monitor::VisitLocks