When we hit the first expanding parameter, no more matching parameters can be picked up. This change remove the faulty break. Change-Id: Ie46652bc4322812a4e1a55cd88e52a0040c6b00b