Merge "init: split property context into platform & non-platform components" am: d04b1ac006 am: b6aa686c71 am: 3a78d95755
am: f3ec3b6c2d

Change-Id: I31249ae30faff09e9a2dc90447406878113a559c