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