Merge "Verify the SELabels used in property_contexts" into pi-dev am: 677bed578e
am: 54c73fa7c1

Change-Id: Ied40850a6d909c69158eaf4fe42ad8c9cf2395ff