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

Change-Id: If06855e76fa95b165e8aacc7e244ae347c4f599f