Merge "Revert "init: split property context into platform & non-platform components""
am: 8e81cd6609

Change-Id: Ia1db23aca8da20fef7288fcd4c4c1c583ad63d09