Merge "init: fix error messages when an invalid section header is found" am: 668f70f6ef
am: 2f57463e0e

Change-Id: I57ac64bc290908475c37a2aac8dcf5615627042c