Enable the additon of UPF(s)

Change-Id: I33e6ab2b005acb03c2dc328fb26d1e988a8eb5f2
4 files changed