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

Change-Id: I147fb87e62e93a54d40f701076463420ed50105e