Merge "Fix NOTICE file."