Merge "Catch exception thrown by SystemProperties.set" into udc-qpr-dev