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