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