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

aanalytics issues resolved