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

Change-Id: Ib9cd6081003b8718dac4516e82e0c97f6ad56e2b