Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I14421b35cec81254f34e3165e988ec079f4dd254