Merge "Update license to be consistent with Helios requirements"