Merge "Remove hardcoded package name."