Merge "Strip separators while sending CLCC response" into nyc-mr2-dev