Merge "composer: fix the logic to validate return value of GetProperty"