Merge "Merge Jetpack SearchSpec work from last two quarters."