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

Change-Id: Id1b5514a10fadbc3ee61c5c36e2f054d9f5930a3