Merge "ahat: better handle bitmaps without pixel info available."
am: 889ab40f1f

Change-Id: Id573e5ccbd77a166040bdd2e0b52371faccbba02