Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I953a302e63124b7ba5d301d3172000ec87c1d67e