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

Change-Id: I68788f1113ca430a29a2bd83a561e9b7afff184f