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