Merge "fix uninitialized warning."
am: 2008d8857c

Change-Id: I867d7b49f827b4817186b0d13a17de62bc143e7c