Cherrypicked 8f16c license notice cleanups