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

Change-Id: I025d2dfedd0965ed8b8588d4261b7d76c3c46a3d