Merge branch 'stable-2.16' * stable-2.16: Upgrade mockito-core to 2.26.0 Change-Id: I0fb4b5c606da9e93c64c0cc4c732215374972010