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

Change-Id: Ie53dd48424ad0a7125658ecc2f90d9339879d762