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

Change-Id: Iff659ffdf206f94e88fcec2a27a1518357fecead