Merge changes I411a3cc2,I9622c214 into main

* changes:
  Refactor Mockito init to follow best practices.
  Replace deprecated AndroidJUnit4.