am 04b633c5: am 0de2eca5: am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev

* commit '04b633c526b3ea72cb13f0c0472673f3baf07625':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder