Just spell out the NULL instead of having a const variable for it

Change-Id: Iee45a5bb80a1d3149aa231f2848910eee415a64b