Proper parsing of x-analytics items

Change-Id: If2c1bbf9aa5f246c199c243681c575bc92026b00