Merge "Clean up ImageHeader section getters."
am: 1accd636dc

Change-Id: I248d72f8a81cae04987cc66eddcf917eb9f4c6d3