Merge "Fix a use-of-uninitialized-value warning"
am: d047e10558

Change-Id: I4bd31c59331b6ef26e36bfff3fe57becf9b5ecc2