Merge "Fix a bug for multi_arf_allowed" into nextgenv2