Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I560c73e3138be5ffcf095c35c60be3efb23993cf