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

Change-Id: I5c6777c92713bce5f17fb23c2f4cb791f1d9dc12