Merge "Fixing resource package name"