fixes for unitialized variable compiler warnings

Change-Id: I81cce450c9490a2b90a4ed915f271a616ebfce13