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

Change-Id: Ife5d9444f9036c16540bd7bf7a1c0e17cf296df5