aanalytics issues resolved
Merge pull request #1681 from ssushma/dev-branch

aanalytics issues resolved