Merge branch 'stable-2.16' * stable-2.16: Upgrade mockito-core to 2.27.0 Change-Id: Ifc5685b7be16b8bd0baa11645473a8a214f1f5e3