Merge "Merge public/property_contexts into private" am: 5476d80b9a

Change-Id: Icb330ae24653df7975d7a0eb75ce69225bb22559