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

Change-Id: Iebd8f7159fa029cfa443877b866d5fb7725aeb5c