Merge "[PiP2] Start with non-null pip params" into main