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

Change-Id: I7a3c6a37e3722cc5892847c11438f8581add418f