am a91b07de: Merge "Workaround for stingray crash due to using old bitmaps. (Bug: 5397469)"

* commit 'a91b07de99bf0ef2f93d5a4bead52f864e039c69':
  Workaround for stingray crash due to using old bitmaps. (Bug: 5397469)