Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.25.1

Change-Id: I659e7530cc9390373156ae64189babfaca3bde11