Use NULL instead of 0 as terminator to array

Change-Id: I034fb304145529791f275db568cd8ce29748a9fd