Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I149c6a26837dfa9bf8b2d895cba8564be1121d7a