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