Merge branch 'merge-image-burner-rewrite' into merge-image-burner

BUG=chromium:388280

Change-Id: I64e3fa81f77a21054a9cd1d90872ebf3b1c00910