Merge "init: split property context into platform & non-platform components" am: b8e5553887 am: b29cafdd83 am: 8861d1fbec
am: 8b70bed4c9

Change-Id: I87724942c332ef020c51b5fc4d3a072c0c65afc5