Merge "Restore the MODULE_LICENSE_BSD and NOTICE files."