Merge "Change to use AOM copyright notice" into nextgenv2