Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev