Merge "Switch to modern ArgumentMatchers"
am: 343c512834

Change-Id: I25f39cefde34f5a27a9abf5d97fe94dcbcfee3cd