Merge "cps-ncmp-rest-stub can not be compiled and executed"