WaE: -Werror=conversion-null

Change-Id: I56380e87c82f785f231b04d2e1b340bb667c59d9