Merge "Fix use of uninitialized memory." am: 45c8586dad
am: 50443ed1ad

* commit '50443ed1ad7a0765030eefb557f9252a46e274db':
  Fix use of uninitialized memory.