Fix lint error and activity package name.