fixes in analytics configuration

Change-Id: I7e890c78554ca4c92af68204446d12bad361da0c
7 files changed