Merge "Merge branch 'pm_phase2' into v2.0. Amend change for NSD based on package_type...