am 9afeefef: am 603564cc: Merge "Fix used before initialized error"

* commit '9afeefefe093f25b89519618df5c45adcd4be616':
  Fix used before initialized error