Merge "Lock ranking fix for monitor IDs."