Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7 am: 0c6283e396
am: 858852a6dc

Change-Id: Ib874408eb77d265a9e939679bd2c5459217063e8