Merge "Makes Studio and Soong kotlin+mockito behavior the same" into main