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

Change-Id: Id36ce20912b477a071cdfb50ae95a16323ecd27e