Revert "Environment NC chooser should only show PhNCSegments"

This work reverts commit 8ac25f4574250cc2290800712e3061dee9561bd8.

Change-Id: I2a45f774733d59cfbb1c9a81e9c162a087dfd765
(cherry picked from commit 96a3e2b2372bcdad91d459ddc5378f4d40639fca)