Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I04877223869de8f17eebe1aa2ac1e2dbd24770f9