Merge branch 'stable-2.13' * stable-2.13: Replace EasyMock with Mockito Compile against 2.13.3 Change-Id: Ifa2a67c5d6bf1deec5b3b8c34cd87bd661c8afb4