Merge "Introduce property types" am: a0ffad60ef am: 3657c80c79
am: cc0ce9b582

Change-Id: I5e2080cf60e49b38269b35ce57a0f998bbf40abb