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

Change-Id: Ifb5916d3ed40d44acf89e7a55b39a3d94f0908f9