Merge "Fix an unintialized return value."
am: f35183daa6

Change-Id: I8673b76740757fa5c95bd5ba87e85b4276be432e