Merge "Add ext_partition_types config option" into nextgenv2