Search only remaining message for delimiter (#12404)

Change-Id: I0d61984aa795ec2b3bd384c2f93f6e3ee2a71be3