Merge "init: split property context into platform & non-platform components"
am: d04b1ac006

Change-Id: I2ba052e3823606d8171aa39391b7d0259033c5cf