Merge "Fix variable unpacking mismatch in bootanalyze.py"
am: 67f1b299ad

Change-Id: I5bea0683bfad5833078ae9e8b612e92ef4b371b6