Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Update mockito-core to 2.24.5

Change-Id: I7d49292d5e3f4ac2f40b99b3e2429cb461d3a098