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