Merge "Fix NullPointerException thrown by logging" into rvc-qpr-dev