Merge "Fix an uninitialized value warning."
am: f943e138d7

Change-Id: I9c3a911998740998608690ce885d2826a710b3d4