Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.24.5
  Upgrade guice to 4.2.1

Change-Id: I7fe0ca418d94efacfc39b3f7ec61be004d820b8f