Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: Iec63e3e19f77853d918c3c712d2877ee235234d4