[INTERNAL][FIX] ODataAnnotations: Complex property annotations

This adds a fix for the presious fix

Change-Id: I0fc7f5fb10f75f17e5b4448d6c3e41f69daf90ee
Merge "[INTERNAL][FIX] ODataAnnotations: Complex property annotations"