Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Upgrade mockito-core to 2.28.2 Change-Id: Iae745bb37f5c0ea4833e7788c84d516f6434b593