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

Change-Id: Ie67332e2942d4113efb2c45cc01b1b2e1489fc4b