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

Change-Id: Iac0ed83870a8d250308c4ed4f96de117060441bc