Merge "Fix un-assignment local variable 'returncode' error"