Merge "Revert "add space in front of property.te"" into udc-dev