Revert "init: split property context into platform & non-platform components" am: 328cb5d141
am: 3b6c6d5d90

Change-Id: Ia36c48aad78b192a2b4e22ccee5845bbe2686d39