Merge "Fix tests/NOTICE file."