Fix uninitialized variables

Change-Id: I9a09844bba9dc3c60f2dbe1867798810ed0a13a8