Merge "Support arbitrary-length properties in property_list." am: c8121ba029 am: 92aab6dbd1
am: be34e5661d

Change-Id: Ia812b1fdb6765088f0ecaed8dc3aaf3492f78b9d