Merge "Introduce property types"
am: a0ffad60ef

Change-Id: Ideb5035d125c541eb763ab5ffde97f899778b25e