Merge "Avoid local variable referenced before assignment"