so \r needs to be taken care of in the split-regex as well

Change-Id: I834d8dcb95b48bbe6c8fa034d5621f006c0dcef8