Merge "Fix licenses and license texts; add package names."