Merge "Catch SercurityException while reading device properties" into udc-dev