Fix the parsing of images without hashtree descriptor am: 9760d1a21d

Change-Id: I3e74a808267dbae37e91a36ca851e30bdc22ed4c