Merge "Cherry pick from AOM:" into nextgenv2