Merge "property_context: split into platform and non-platform components." am: ccbf463a am: 88b4a532 am: 5c68562b Change-Id: I5eb3d5448a99ffc6fa753c332679339490fb6456