Merge "Document property expansion."
am: a4644c9bc4

Change-Id: I3dfaee7ccfcbe77cc5ae7cb02bf51551cbcc2f4b