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

Change-Id: Ie8464f8b26188b12837d3eaead36eb94bf150a64