Generalize common property extraction
am: a7cd8c8344

Change-Id: I6ccbf28f66343f7bce836bb0cbdfdbfcaecf4ce8