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

Change-Id: If22af3514605ffd9c4ef50cb5adba44c4c49a413