Merge "Cherry pick from AOMedia" into nextgenv2