Merge "updater: Clean up the header lines computation." am: a5735e9b5f am: 1e29bb6717
am: b8a04272c8

Change-Id: Ie044e694af47e2c115f1ba1030e331c99202611d