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

Change-Id: Ie8814a45544bbe9248d6116336547eb67b675583