Comma escaping

Change-Id: I5b12faa2bdca793901a74bfc5b6dbd72998ec069