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

Change-Id: I47059e2f25361093fdff1743ccc0c3682b0827b3