Merge "Remove redundant experimental flags from common_data.h" into nextgenv2