Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I7e0590f0050542df8e0ef1112a6ed37c541d6fcb