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

* commit '603564cc40b6ee217b8be31ea08cd14f02f44679':
  Fix used before initialized error