Merge "Revert "property_context: split into platform and non-platform components."" am: 615b60bd am: d28e0433 am: c2bd29bd am: 797d5b97 Change-Id: I7dff82006b781e3888fd9239a83f5a39c35b567a