Merge "Verify the SELabels used in property_contexts" am: 324e27d284
am: 7608894fe0

Change-Id: I0fd3ab6353bc6009b28526db97427025a4c600c5