Merge "Check for drmhal plugin null pointer deref" into oc-dev am: a5f3e42433
am: 5d057106af

Change-Id: I935c935ef3dc083af711be46e8d6ed73660e4c89