Merge branch 'stable-2.16'

* stable-2.16:
  Update mockito-core to 2.24.5

Change-Id: I63e8b64ec1a55dd3771eb212c08b869a7a5c68ff