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

Change-Id: I2a621725268bea0eb255dcca7b0d1ea842bee329