Merge "Store additional information in image header."
am: 2d17c5149b

Change-Id: I84326035e9d45ae974e88f68612aab4f6567a6af