Refactor code incompatible with Mockito 2.7.13 am: d529415c68
am: 65a7c6845d

Change-Id: Ic09f2a1f08441c9e44612b2f2a63902f7e12764c