Merge "Separating packageName from the AndroidManifest"