Fix unintialized memory issues reported by valgrind

Change-Id: I2cdd303e0035d8e599fe5f4d9520f58c3058ccf4
2 files changed