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

Change-Id: I07ecec74a2e8156a477d93c42302d5e6299a6d31