Merge "Fix an unintialized return value." am: f35183daa6 Change-Id: I8673b76740757fa5c95bd5ba87e85b4276be432e Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core Cr-Mirrored-Commit: 9efd5366ca323e9761f29893c2cc85a6c990f8c5