Merge changes from topic "presubmit-am-ff4b6f140cb34a34a6d7cbc514cffb9d"

* changes:
  [automerged blank] Address some mockito upgrade api change 2p: 6d5b67d4c6
  Address some mockito upgrade api change