Merge "Fix variable unpacking mismatch in bootanalyze.py"