Merge "Check for drmhal plugin null pointer deref" into oc-dev