am 584674c3: am c6de3212: Merge "Don\'t try to scale the bitmaps for null...
am 584674c3: am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev automerge: 422db53f
* commit '584674c3':
Don't try to scale the bitmaps for null MediaMetadata.