Merge "fix uninitialized warning." am: 2008d8857c
am: ad17ddb376

Change-Id: I8fd647b38b0a911a9bc7fbcd9cefd046362dec5b