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

Change-Id: I7103c06cf8c397a5ec2d536a4b7b16258f686244