Merge "init: split property context into platform & non-platform components" am: b8e5553887
am: b29cafdd83

Change-Id: I521d8f322b1c43cb28b84001b3273cb410e33557