Merge "Make WM Jetpack unit tests mockable" into tm-dev