Merge "Fix cps-nf-proxy standalone assembly."