Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Upgrade mockito-core to 2.25.1 Change-Id: I4b26ef1191303c8abf022e88cf9018cc245cfbdc