Merge branch 'stable-2.13' * stable-2.13: Replace EasyMock with Mockito Change-Id: I6d5e24d03ea3ffa4236f6a34ab34185ac5d6985f