Merge "Switch to modern ArgumentMatchers" am: b8bf3bbc72 am: ced2263d48
am: e360d51476

Change-Id: I2fb154f48bcfedecb5dbd8ccb2792ba34366ed71