Merge "Fix used before initialized error"