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

Change-Id: I03a0e1652be13090287ad8b669940cef6a70a09a