Develop branch sync

Analytics refactoring
Lint analysis fixes
Added some null checking
Removed unused files
Fixed some copyright header info

Change-Id: I31e44659fa79b14641e38ffab43aad8627aa9de5
Merge "Develop branch sync"