Merge "Fix merge issues related  --enable-ec-adapt" into nextgenv2