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

* commit '45c8586dad4796fa227b60745ba2d0dbae44b062':
  Fix use of uninitialized memory.