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

Change-Id: I6cecbe5ea337156f148a45e4c51782b62af96eda