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

Change-Id: Ie9624644861ae65a7eed01062f79e1e4e07f5235