Merge "Refactor code incompatible with Mockito 2.7.13"
am: d9215e0934

Change-Id: I28a0ed182cce29a7c62fcb3ae5e113d776c46251