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

Change-Id: I06d76c258312fcf70a6c2f63baa5999cdfff86e4