Merge "Allow properties to be derived from partition-specific properties during init"
am: 944e6f1d17

Change-Id: I20fc0657ecb8d2dc383e1349bb01580d806138b7