Merge changes Id87c25ec,Ib0837ee6 into main

* changes:
  Offer Mockito under Ravenwood.
  Offer Mainline stubs under Ravenwood.