Merge "Allow properties to be derived from partition-specific properties...
Merge "Allow properties to be derived from partition-specific properties during init" am: 944e6f1d am: 919a931f
am: 0ea78a50
Change-Id: If0ecaaf4883f1a8a4e7a0b9602602e6fbcc9b863