Merge "Use Extended Mockito in the frameworks/base unit tests." into main