Merge "Merge "Switch to modern ArgumentMatchers" am: 343c512834 am: 3f5a8e019e am: b4fb45f755"