Merge "property_context: split into platform and non-platform components." am: ccbf463a am: 88b4a532 am: 5c68562b
am: 2ff687d7

Change-Id: I7743e6f61752125dacf930fcb83eae79668a0a37