PAC-215. Fixing None cannot be assigned to relationship property.

Change-Id: Ib187dfb8b7c273ff949015979c19ba297d823c3b
Merge "PAC-215. Fixing None cannot be assigned to relationship property." into v2