property_context: split into platform and non-platform components. am: 262edc38 am: af8c60fe am: a9aeef03 am: e796428f Change-Id: I3339566f978993a150bb85f53f4e2a2041a6a6a3