Merge "Fix the parsing of images without hashtree descriptor" am: bb188735ca am: 3a6cb4a246

Change-Id: I6fbdcf2afc593673fb9e78d204861ba906650ab0