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

Change-Id: Ia5c68dd349620fee202f988280040cc93bd2eafa