Merge "Updates/Fix on Legal/License Headers"

No match.