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

Change-Id: I827c8fa7a04b0c6da8bbdd3a3a7e6f974c448076