Merge "Document property expansion." am: a4644c9bc4
am: 31d17cf622

Change-Id: I47f0c5cb4cd6b1a6740a8f95c843c823ae00aed7