Merge "Do not allow new additions to core_property_type" am: d57dd813 am: f13dcbb4 am: 5bfa8509
am: 47e2f081

Change-Id: I24705f584bc462f45c4400eab18decdbfa66dfda