Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I28ebbd706795e879929a5df98dd3e64866d953ca