Merge "Don't use hardcoded package name."